perf(cli): Split off highly divergent branches #220
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Originally, we would bail out if there is no base. We might split off branches that are very-divergent branches from their base, so we need to make this better. The first step was allowing it. This is the next where we infer a "good enough" base to probide context for the user.
In gitext-rs#216, a user is backporting changes on Linux and hadn't marked protected branches which would serve as bases, causing git-stack to topologically sort commits that are very distant from each other, causing a simple showing of the commit graph to take 20-30s. This change infers that these branches are do not belong to their base and split them off. Now showing the commit graph takes about 6s as it tries each base.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #216, a user is backporting changes on Linux and hadn't marked
protected branches which would serve as bases, causing git-stack to
topologically sort commits that are very distant from each other,
causing a simple showing of the commit graph to take 20-30s.
This change infers that these branches are do not belong to their base
and split them off. Now showing the commit graph takes about 6s as it
tries each base.